Fix up non-valgrind case to send stderr to file like valgrind case does.

(Having trouble with signal delivery and valgrind, causing spurious test
timeouts)
Signed-off-by: Rusty Russel <rusty@rustcorp.com.au>
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>

diff --git a/tools/xenstore/testsuite/test.sh b/tools/xenstore/testsuite/test.sh
index 29070030e3fc023348445c63e7ccf70e9bb1bc02..78386bf9310fc39482262d3445dd662832a5fbdb 100755 (executable)
--- a/tools/xenstore/testsuite/test.sh
+++ b/tools/xenstore/testsuite/test.sh
@@ -14,7 +14,10 @@ run_test()
        PID=`cat /tmp/pid`
        rm /tmp/pid
     else
-       PID=`./xenstored_test --output-pid`
+       ./xenstored_test --output-pid --trace-file=testsuite/tmp/trace --no-fork > /tmp/pid 2> testsuite/tmp/xenstored_errors &
+       while [ ! -s /tmp/pid ]; do sleep 0; done
+       PID=`cat /tmp/pid`
+       rm /tmp/pid
     fi
     if sh -e $2 $1; then
        if [ -s testsuite/tmp/vgout ]; then